Get rid of controller pollution