Remove more unnecessary dependencies