Toke validation removed temporarely