Added the ability to remove tokens