removed deprecated has_role etc so doesn't trip me up again.