[client] cleanup unused code