remove some ifdef'd code leftover from the split into separate file.
Authored by: tmh 2007-12-07
Parent: [r650]
Child: [r652]