Clean up request handling significantly.