Made sure tokens are removed upon closing