remove dependency on fabric