Cleanup stateless methods
Fix rspec specific Gemspecs to work on cold cache