More cleanup and preparations.