Clean up token storage methods