Remove Location instantiations from CMS non-test files