Revert "Delete notes"

This reverts commit 502177fabd8e0eca45183bc36a5829ff6b92918f.
Revert "Revert "Delete notes""

This reverts commit 0818ad2b590abd70ecd9b0df3a4033cfe956d36a.
Update to 2.3