Cleanup Index interface and implementation