removed direct token support, but fully delegated to entity properties

Closes #16