remove goo

Change-Id: Ib26f4ce6d0dae8b2fd67935ca095bd8121cc4ae3
adds and removes

Change-Id: I1f793fe42a49d7da849eb8e580ce93930ee62ab9