Do some extra cleanup