Cleanup

Notes cleanup