removed everything for new structure