code cleanup, removed unused or duplicate imports.
Authored by: mrieser 2010-08-09
Parent: [r12274]
Child: [r12276]