refactoring REMOVE EMPTY SUBCLASS added
16 files changed