Architecture cleaning (34/48)

Architecture cleaning