Removing unused constant
Cosmetic
* Making the DataToken a wrapper around the value it holds
* Making the DataToken easily pickleable (even when its a wrapper)