minor cleanup; implemented v2.x client