Revert back to space-free version
Safer clean command