Changes to make RRsets better
Cleanup