New approach.  Threw everything away and started fresh.
Removed old files from index.