Add @Override annotations, removed unused imports