additions and removals

Change-Id: I303c2d9c867d5792fd0e134bd053a16b3b01d39a