Architecture cleaning (26/48)

Architecture cleaning