Editors: Some cleanups