Removing unused member variables