merge UMap and UPat

UPats are now UMaps, no need for separate class