Removed unused debugging code, added extensive comments about the old functionality that I've disabled.