cleaning some cruft in controller; the active pain doesn't switch unless the spec changes