Moved methods to a new Cleanup class
Moved methods to ImgProc class