Clean up instances of janky none string handling from config