cleanup, remove some debug code