removed redundant functions