rm eval code, fix builtin method call