remove cruft
Merge branch 'develop'