remove some redundant functions