Removed checks for the proxy (useless at this point)
avoid repetitions