Remove unused imports, Add missing @Override annotations