Remove TODO from datastore.connection.