Notes cleanup