refactoring REMOVE SUPERCLASS added
15 files changed