fix proxy
cleaning branch