Some cleanup and a note.