remove some code used for tests