cleanup of evolay package