Removed/improved debugging code.