hack through to tidy up the mail file

Change-Id: I9e0689239eb0170c91dd1f65decff0d462738d16
tidy cleanup.sh

Change-Id: I7ef3bc0809e7c8af2160149d3f31538701530f59