some cleanup, removed commented code
Authored by: grether 2010-02-20
Parent: [r10521]
Child: [r10523]