Remove external dependency

Pulls code into mapper for smaller merge risk