New index design and cleaning old files