Remove the legecy structure