Remove unnecessary member variables