Move remaining indexing code, delete separate job, update scripts