remove two deprecations and survive errors in repl