Remove unneeded controller and route; add include