code cleanup
minimize logging during testing