Remove some obsolete #defines.