some refactoring
removed some unused classes