removing cruft
more cleanup
Merge branch 'dev'