cleaning up for the merge