Refactoring: Full cleanup