remove unnecessary logic
9.2 by default at client