Clean Up: Javadoc, unused code, fixed imports, and such.
Removed unused imports
Fixed Javadoc issues.
Minor fixes.
Fixed Javadoc issues.
Merge branch 'mvr/cleanup'