Actually removed the useless controllers