Major cleanup of dependencies, also bump dependencies version