Remove Bonds, reorganize