Using trusted port rather than hardcoded 5058
Code complete - deregistering implemented