Simplifies cleaning

Simplifies cleaning