Clean up

Cleaned up and removed unnecessary imports.