Removed more unnecessary dependencies