Adios Goo

and small cleanup

Change-Id: I5b2c9665d8c59d0c599ac90b152d992bc7fb110b