Cleaned up code.

Removed unused imports, etc.