Cleaned up and removed all unused imports.
Authored by: bugman 2010-01-28
Parent: [r10530]
Child: [r10532]