More cleanup after freaking out.