Formatting cleanup and removal of unused code (e.g. ApplicationContextAware-ness) from the base controller.

Issue: none
Reviewer: Daniel J