Architecture cleaning (14/48)

Architecture cleaning