removed references to locations