Removing unneeded dependencies from here too. Dodgy merge, I think.