Updated libs and removed overrides