Removed unneeded conditionals

The conditionals checked whether values were set which had default values