cleanup token removal