Removing dead code from Evd.