Update to use the new concept of token data storage adopted by alf
Updating alf version
Removing custom tokens that are no longer needed