Cleanup: remove wrapper lib