Cleaned up some of the mess in the merge