Architecture cleaning (18/48)

Architecture cleaning