VE-1564 Type check and remove unnecessary default