Removed redundant functions and parameters.