Keep track of the pads we added and removed. Remove some unused fields. Don't add pads for which we don't have caps.