cleaning up more logging statements