Remove assignments to parameters refactor