cleanup before squashing to new branch