Removing some dependencies