Rework index config setting, remove legacy files