less of our own deprecations + cleanup (some left over 1.7 incompatible imports in BN)