removed code from uf-util