Added de-registration possibility.