More cleanup and status debugging