Remove some default values that were mistakenly left in the code