Remove unused identifiers to allow building with libmagickwand-dev 8:6.6.9.7-5ubuntu3.2
Merge branch 'master' into go1