Merge changes I343272f4,I5481893a into main * changes: Removing headers + using string Removing double delete from flashall