Get rid of unnecessary parameters