Some clean up in localiton/ files