Tidy up of unneeded alterations