Cleaning up simple tokens