Merge "Remove unused class member SAVE"