remove instance variables unused since a788956