Clear up config a bit to remove fig/docker references