Removed redundant funcs