remove wildcard import, extranious imports, and commentd code
Authored by: jpaetzel 2011-04-14
Parent: [r5996]
Child: [r5998]