Cleaned editor branch