cleaned up entire client branch