cleans up for new structure