cleaning up

*removed classes