editor fixes after this removal