Clean it up because we haven't ever done it this way.