Clean up and working amazon upload