Updating various libraries

Removing a bunch of unused code