acu84321 - [driveclient::default] - more cleanup code