Cleaned up some of the debug messages