More note cleanups