######################################
Wasn't updating references to deleted locations. Fixed.