Almost got the removal re-indexing working