code cleanup: removed unused fields and imports
Authored by: mrieser 2010-04-14
Parent: [r11078]
Child: [r11080]