Architecture cleaning (28/48)

Architecture cleaning