Cleanup on editor branch