Remove unneeded dependencies and replace with ours