cleaned up code and got rid of unused classes