Refactoring and hardening of conditional required arguments
Removed old file
refactoring and hardening of conditional if