Do some cleaning again