KRACOEUS-7847: cleaning up controller