D: remove client code close #1