Remove merge leftovers
Merge pull request #1228 from Ayrx/remove-merge-leftovers

Remove merge leftovers