Fix update order
Remove unused map util