Remove expensive validation