Remove ui-variables dependency

Will be part of the settings