Clean-ups in registry node class