gets rid of extra includes and useless controller