changed clean mechanism