Cleanup index for Clarity