removed hardcoded tokens