Cleaned up unused imports.
Removed class name identifiers.