Remove more _roles references