Fix up removeOrb functions