got rid of some TODO's in SynapseClientImpl.