Changing back to single-shelf format in downloader
Removing argparse cruft