Fix to clean up: tombstones were not being actually cleaned