(minor) Remove unneeded member variables