remove redunandant functions