cleaning up some code and deleting used files