remove dependency on charm.v2/hooks