Architecture cleaning (36/48)

Architecture cleaning