Remove @Override annotations for Java 1.5 compatibility