restructure data; delete restructuring code