Remove defines for removed optional code.
Remove defines for removed optional code.

davel/sox,uklauer/sox,CaptainHayashi/sox,pcqpcq/sox,davel/sox,cbagwell/sox,MageSlayer/sox,uklauer/sox,mhartzel/sox_personal_fork,pcqpcq/sox,jacksonh/sox,davel/sox,mhartzel/sox_personal_fork,pcqpcq/sox,mhartzel/sox_personal_fork,mhartzel/sox_personal_fork,Distrotech/sox,cbagwell/sox,Motiejus/sox,uklauer/sox,MageSlayer/sox,Motiejus/sox,cbagwell/sox,MageSlayer/sox,davel/sox,Distrotech/sox,jacksonh/sox,CaptainHayashi/sox,cbagwell/sox,jacksonh/sox,MageSlayer/sox,CaptainHayashi/sox,CaptainHayashi/sox,jacksonh/sox,Distrotech/sox,Motiejus/sox,Motiejus/sox,MageSlayer/sox,Distrotech/sox,pcqpcq/sox,uklauer/sox