Minor:

- cleanup and convert
remove this setting and let script use 30 by default