Fixed requestId cleanup issue