editor cleanup (second pass)