Fixed a lot of grasping code, plus removed unnecessary, old dependencies