registry: minor cleaning up