Sales engine class cleanup