Removed old style request id handling