Some more debug cleanup.