Move cleanTokeValues() to manager