File cleanup and finalyzing efforts for p2 delivery