NEXUS0-5602: No need to protect unregister
NEXUS-5602: Comment fixed + reformat

No code change.