Support comments in to_delete file; Misc enhancements