NOTES cleanup