Explicitly create/modify/delete new OriginID to stop cleanup warning