More cleanup and catching up