Cleaned up unused imports and Javadocs.