Small refactorings

I made some minor changes to delete some unnecessary code.  If you're open to these type of changes, I'd be happy to go through the entire codebase to add some tests and clean it up.  I'm traveling in Vietnam at the moment, but will be looking for open source projects to work on when I get home in a couple of weeks.  Thanks!