Revert "Proxy is almost ready"

This reverts commit 04866a7b56b9dd659347634ce579c24ed1bd694e.