Removing some unneeded dependencies