Little bit of cleanup before the merge