remove dependency of v7 support api