More cleanup. Sigh.