Cleanup debugging r=rhelmer