removed redundant function parameters