remove more self's