code cleanup while trying to fix unstable test
Authored by: mrieser 2010-02-15
Parent: [r10436]
Child: [r10438]