Eval cleanup