Architecture cleaning (22/48)

Architecture cleaning