CLeanup, changes