Fix recycling of dataset
Cleanup
Remind me to automate this, will ya?