Architecture cleaning (11/48)

Architecture cleaning