Simplify delivery script