Architecture cleaning (44/48)

Architecture cleaning