Remove unused parameters from internal functions