Do some clean up