Removed/reverted some debugging code