Architecture cleaning (45/48)

Architecture cleaning