Clean up NO_INDEX
5 files changed