Cleaned up some of the more excessive logging