Getting rid of some unused third party code