more cleanup on build-client