Some notes cleanup