Some cleanup and added fallback thread pool based SPI

This one is used in tests currently