Architecture cleaning (30/48)

Architecture cleaning