Get rid of application controller