Fix up nightly script and remove weekly script