Removes evals in the generator

This patch removes unuseful evals
in the generator.

Change-Id: I38e625f60a78a090980f3bf6f334b1fc8e77de93
Merge "Removes evals in the generator"