code removed refactor server spi