Cleanup in contrib related to data extraction

Signed-off-by: Xfurry <xfurry@scriptdev2.com>