Removed 2 redundant functions