Removing unused methods
Unused variable and import