Cleaned up some old files from 3.10.17 development