Architecture cleaning (31/48)

Architecture cleaning