Remove unused classes from SPI and container