Remove hardcoded roles