cleanups, including a global missing @Override annotation refactoring