cleanup due to engine changes