remove dependency on p4