editor cleanups batch 2