Remove config dependency