More notes clean up