Remove Config.connect calls