More Cleanup from the Failed Merge

I dislike Github for merging branches