More cleanup, making sure things are stable.