Removing some unnecessary dependencies