Cleanup
Update indices