More cleanup. More notes.