Removed some unneeded 3rd party stuff