No, we need to REMOVE them as they are and make them party forced spawns like treasure hunts, end of the story.