Architecture cleaning (20/48)

Architecture cleaning