Architecture cleaning (38/48)

Architecture cleaning