Some code maintenance of old connectors.