Debugging code cleanup.