Do some cleanup