cleanup

Change-Id: I2852eaa1e9aef82904e3d5366b70aab197182dab
offmode charging maybe

Change-Id: I6533c630688856cec245cc14a6852e20fc3a7da4