remove dependency on Fabric