Remove comment
Added Builtin types
Merge branch 'evaluation'

* evaluation:
  Added Builtin types
  Remove comment