Removed temporary code
Fixed a regression where indexes could remain stale indefinitely