marginal eval cleanup