Revert "Revert "CleanProject""

This reverts commit 57b862bcaf1aae5feb14a14085c05214c1326cfe.