cleanup and add goo