removed unused imports and re-ordered imports to make eclipse happy.