Removed more minor debug code