Remove unused index
Merge branch 'master' into struct-editor