Revert "Revert "Correctly added CleanActivity""

This reverts commit c6cb586214de5db949403a36f3cc2d93584d37fe.
my fault