Reorganize Unregister to be more readable.
Merge pull request #327 from erbridge/commandhandler_unregister

Reorganize Unregister to be more readable