remove more sensors for battery, remove two ESM questions for Aware bug