Removed unnecessary eval statements