cleaned up code and deleted unused files