removed some dependencies irrelevant to eval