Clean-up and capify