More cleanup of debug