remove old impl
client with comments