Architecture cleaning (29/48)

Architecture cleaning