More redudant functions deleted