Converted update request to use expressions for handling map removes
Pending: convert Expected to expressions