Fix Remove after SpaceEmotion reverted its logic.