Refactor

Remove unused params