Updated controllers to remove old stuff.