Make some clean up