Removed additional redundant functions