Architecture cleaning (23/48)

Architecture cleaning