add constant for token removal flag