Revert "I can haz fuelgauge and sound?"

This reverts commit 84eb420c4bd23a03c137b89f5f12ba1bccf52a4f.
Revert "Probably should re-enable these"

This reverts commit 5a7c79cb035edabcb9de2bbf78e11d9cc148b484.