Debug code cleanup.