Fixing bug that deleted optimized files after an unsuccessful merge.
Fixing inline doc.
Cleanup.