Added missing @Override annotations
Removed unused imports