Removed old references to #location in favour of .location_id