Remove freight, add deb-s3