[NGRINDER-699] Fix all unnecessary codes