Cleanup of code to manage registry datasets