editor cleanups batch 3