Pre-Final Deadline Cleanup II