Cleanup prior to trunk merge.