Clean up some logging statements