Removed unused code

Making it easier to refactor into a super class. Added some javadoc
missed in the last commit.