Remove some more unused #defines.