Remove a few now unnecessary imports