Update the setup scripts
Use single quotes where possible
Remove import config