Remove Location() creation from LMS non-test files