Removed redundant functions