Remove merge leftovers
Merge pull request #2008 from chrisvest/remove-merge-leftovers

Remove merge leftovers