Remove both validation & test for it