Clean up for generic change in IConnector