Clean up wrapper
Update build scripts to optimize
Recompile source