remove some defunct code from unit tests