Added support for removing notes