Clean up request plugin handling a bit