Sandbox remove fix