remove deprecated files, general cleanup
Merge branch 'cleanup'