MEditor cleanup