clean up
remove redundant params