Got rid of remote option for proxy

Don't merge yet
@bryanhiggins Please ask Jenny to help testing this.