New index, big cleanup