Mostly cleanup commit. WARNING: Changed SPI interface!