Remove some usage of "note"