Clean up bloated request spec