Ran automated cleanup of code base doing reformat, adding missing @Override annotations and removing unused imports.