[NGRINDER-697] Simplify impl