Remove Optional @Override that break java 1.5 and 1.7