Removed redundant parameters