Remove external dependency (bloat)