Remove redundant code
Merge branch 'eval'