TokenController cleanup