Removed Unneeded classes
Cleaning up.