General Notes clean up