removed classes to be refactored and replaced