KRACOEUS-7847: cleaning up controller
Merge pull request #1 from leoherbie/KRACOEUS-7847

KRACOEUS-7847: cleaning up controller