#4137 Improve clean