remove debug message and add correct tokens