Remove breaking references to Config