Some debug cleanup.