Unneeded classes

Removed unneeded classes