Merge "Cleanup Editor.java."