Cleanup, new indexes.