Remove external dependency