Final clean up of the deliverables