Cleanout old 3.1 files left over from gh-1262
Should prevent issues like gh-1514 from reoccuring
Merge pull request #1515 from nschonni/cleanout-v3.1-files

Cleanout old 3.1 files left over from gh-1262