Clean up EditorStatus, comment debug code