Remove ui-variables dependency