Removed some includes and commmented up a bit of the code and removed test classes and some othe stuff