Partially addressed this just now my moving the deli POI to the right location: https://www.openstreetmap.org/changeset/156120061

Just have to check if it is okay to delete the Enterprise location, or if we need to move it to some kind of "retired" feature type like we do with normal buildings.