removed redundant fns