more cleaning up, removing dead files, formatting, jshint blah blah