more spi cleanup