Cleaning up SPIs