remove some logging and old code