Make default behaviour for main.py be what --no-retry does and remove what would happen if it wasn't specified
Make default behaviour for main.py be what --no-retry does and remove what would happen if it wasn't specified