Do some clean up.