More cleanup notes