Add create index, cleanup.