Improved clean command