Better clean (8/25)

Better clean