removed redundant funcs