Remove legacy role check
Role legacy remove