Update adds/removes

Change-Id: I093266d6317a3937a3f47c402c5a8855246b44c2