Cleanup Merge

Forgot that there were outstanding files to commit.