MapUtils cleaned