clean up unused
Merge pull request #43 from leigh123linux/upower_cleanup

[upower] clean up unused label and variables