Remove some unnecessary imports