(fix) cleans up code and deletes unused files #148

Closed jackmcd4 closed 9 years ago