Remove cleanup from vPing scripts, and use the existing cleanup script