Added @Override annotations
Removed unused imports
Commented out unused method
Removed unused code/imports