Clean up missing/unnecessary imports following #110