Remove more unnecessary imports