Add strict comparaison
Add strict verification
Delete unused parameters