Debug spew, cleanup