Cleanup some of the request specs