Remove dependency on unset config var