Argument validation removed