Contribution housekeeping

Minimizing a method and removing an unused controller.