by some form of miracle, rst saved us all
SPI mess cleanup