Make editor a local annotation
Clean some legacy from annotation invites
Simplify editor