smaller refactoring
removed default logging in proxy