removed some eval code