added token and fixed rm -i issue