Cleanup some SIMO code.