Do some more cleanup