Removed classes

Removed un-wanted changes