Removing usages of Role