Architecture cleaning (46/48)

Architecture cleaning