remove dependency on deprecated components, better shareability