More cleanup and bz2 prep