Cleanup from the merge