[iPlug] remove formatting and spacing unnecessary diffs with forked versions to ease merging