Code Cleanup

Removed unneeded imports.