6345 remove xhat support