Second pass of note cleanup