Clean up curate.rb and custodian_spec.rb