Get rid of battery bar cherrypicks