Merge pull request #1867 from ethomson/remove_not_delete 'del' instead of 'delete' for the poor C++ users