Fix: remove deprecated code
Fix: move not required parameters at the end