- Editor: cleanup