clean up controller/front and some other things too