Remove external dependencies from the build
Remove old wrapper