Remove different build configuration; fix rspec deprecations