Reverted some debugging changes. Dropped dead code.