Add @Override annotations, removed unused parameters