Removed un-used classes