Removed unused member variables.
Fixed obsolete macro statements.