Cleanup.
Remove override annotation for compilation on Java 1.5.
Merge branch 'master-working-2'