Latet changes from pete
Remove unneeded dependency, add another one