removed unnecessary code and cleaned up project