Remove unused member variables