removed unneeded classes
Stuff