removed redundant parameters