refactoring REMOVE EMPTY SUPERCLASS added
16 files changed