Removed error @Override annotations
Updated from Java 1.5 to 1.7