Repository is deprecated
Remove a few more files
Merge branch 'master' into maintain/1.9