little more cleanup, delete files and pluck some more from master

little more cleanup, delete files and pluck some more from master #2181