update the goo setup for bundle data
delete lots of legacy layout data