Make cleaning optional for device map (#2233)
* Make cleaning optional for device map
* Apply suggestions from code review
Co-authored-by: Marc Sun <57196510+SunMarc@users.noreply.github.com>
* Change order
* Nit
---------
Co-authored-by: Marc Sun <57196510+SunMarc@users.noreply.github.com>
