Code Cleanup : Removed unused code and imports