Code that did cleaning in previous commit