Removed all unused imports and organized imports by type. Jake. git:jakehaas

ok to test