debugging code cleanup.