More cleanup.  Erroring out on doortest is bad.