More token removal