cleanup unused code
Merge branch 'master' of github.com:ideo/core-firmware