clean up and retab.