Clean files post filling-in-routes and layout