Note cleanups