Remove empty options
Don't manually define options identical to defaults