fixes to broken build
cleanup
Merge branch 'deploy'