Less verbose cleanup