fix specs and remove deprecations