Get rid of has_role