Remove unneeded files plus various cleanup/fixes

Master currently does not build for me so I can't check make distcheck. However on branch 1.6 make distcheck passes so I am going to assume they will on master.