Format device source fixes:

- merge CM Recovery sources to recursive delete
- clean up and potential bug fixes for format volume functions
6.49.1