Remove hardcoded n.pcs call