Refactor: pass generator only when needed
Unused code removed
Refactor: drop dependency from baselanguage.editor (use of styles only leads to complete editor model being loaded)
refactor: simplify, drop unused code
Merge branch 'master' into 3.1/artem/default