refactor so no unused param