Extenso: remove feature envy