Remove dependency of third party lib