Removing redundant functions