Removing Some Unnecessary Functions