removed or commented out unused code
Authored by: mrieser 2010-02-16
Parent: [r10442]
Child: [r10444]