Removed old debugging code lines and some redundant comments.