Some Merge Cleanup