notes, cleanup