Removed some of the diagnostic output