Add -r flag to continue running and repeat cleanup