Code Cleanup: UserRoles cleaned