201f6b6bb2
Motivation: Opportunities for clean up found while working on a different PR. Modification: * Dead code has been removed. * Unnecessary parenthesis, qualifiers, etc. removed. * Unused imports removed. * Override annotations added where missing. Result: Cleaner code