note cleanups