Payroll clean-up plan underway