Final 3.1.4 cleanup of the branch

now that 3.1.4.6 is in we can get rid of the old files.