Cleaned up debug messages.
cleared merge conflict, using version with debug info removed