Removed @Override annotations from wrong places