getting rid of self refs