evpd cleaner code
evpd fixes