added remove_token