Got rid of all member references