Rename operation and add @Optional to remove-objects-using-map. CLDCONNECT-962