Enhancement 1081, Add un-register.