Proper removal of tokens