[NGRINDER-690] Simplify impl