epic refactoring-not needed classes were destroyed