Remove unnecessary calls to withEditor