Remove the roles script
Merge branch 'feature/remove-roles' into develop