Cleanup EVASS merge