Remove rspec deprecations