SPI_api Clean-up