No code seems to use these arguments anymore so it's better to remove them and simplify the code by removing unsused code paths.