Merge pull request #259 from spawluk-bitbar/devel

API refactor
Merge pull request #260 from spawluk-bitbar/devel

remove unused code