Get rid of controllers