Campbell will clean this stuff anyway, but better do it in the branch, so trunk history would stay clean.