Removing external dependencies