Do some tidying up.