clean out non legacy stuff
cleanup
Merge branch 'legacy'