further cleaning up SPIs