Changed around ordering of imports, removed now-unnecessary imports.