Cleanup pkg wrapper for CLI usage