added some old things
Merge branch 'cleanup'