Fix errors in build
Revert "Settings: Battery Bar [2/2]"

This reverts commit 13994d5acfa868ade54a189bcf8df5a68c86b456.
Cleanup code Battery Bar [2/2]