Code Cleanup

Removed unnecessary imports and code.
Added SupressWarnings where needed.