Remove NoteId (change to UUID)