Another quick code clean up.
Removed all unused imports and variables.