cleaned up Core/Eval