KRACOEUS-7847: cleaning up controller

Yup, this is what I was talking about, thanks @leoherbie