Code clean-up.

Removed warnings, removed unused method parameters, and removed invalid references in comments.