[IMP] Arch Refactoring Stage 3: Clean old codes