Cleanup
Migrating contributor types as roles