Remove some debug cruft and better toggle.