Remove legacy amo-validator nonsense