Move cleanTokeValues() to manager

Seems unnecessary?