Eliminated redundant functions