Fix/complete SPI module removal