Removing third party cruft