Remove redundant functions