CMS-2723 Remove old content index code

Some more cleanup