More clean up
Merge branch 'master' of github.com:metalaureate/rux-bb
More cleanup