Cleaned up some of the debugging messages