Reverted some of my early diagnostic messages as these are no longer relevant or necessary.