removing redundant functions