Clean up the controller. Found two cases we need to write tests for
Clean up the controller. Found two cases we need to write tests for

yannbelief/escservesconfig,yannbelief/escservesconfig,yannbelief/escservesconfig,yannbelief/escservesconfig