Minor cleanup

Removing unused methods, a few comments, and changing a few variable names.