Missed a couple of cleanups in controller.