[TASK] Drop two unused variables and a surplus argument