update comment
fix unregistration
Merge pull request #1090 from shackbarth/unregister

fix unregistration
Merge branch 'master' into 21986-workflow