diff --git a/meta-arago-distro/classes/recipe-data.bbclass b/meta-arago-distro/classes/recipe-data.bbclass
deleted file mode 100644
index be1db1ff..00000000
--- a/meta-arago-distro/classes/recipe-data.bbclass
+++ /dev/null
@@ -1,100 +0,0 @@
-# This class will record certain information about dependent recipes to a conf
-# file. This way it can be retrieved by other recipes. For example, this can be
-# used to obtain the SRC_URI for the SDK's SW manifest.
-
-# Configuration file to record the recipe data.
-RECIPE_DATA_FILE ?= "${TMPDIR}/recipe_data.conf"
-
-# Variables to record
-RECIPE_DATA_VARS ?= "PV SRC_URI FILE"
-
-
-# Helper to load the data from the conf file
-def recipe_data_load(d, recipe_data = bb.data.init()):
-    fn = d.getVar('RECIPE_DATA_FILE', True)
-
-    if not fn:
-        bb.fatal('"RECIPE_DATA_FILE" is not defined!')
-
-    if os.path.exists(fn):
-        with bb.utils.fileslocked([fn + '.lock']):
-            try:
-                bb.parse.handle(fn, recipe_data)
-            except Exception as e:
-                bb.warn('ERROR parsing "%s"' % fn)
-                bb.fatal(str(e))
-
-    return recipe_data
-
-
-def recipe_data_get_var(var, pn, d):
-    if var not in (d.getVar('RECIPE_DATA_VARS', True) or '').split():
-        bb.fatal('Variable "%s" was not configured to be recored' % var)
-
-    recipe_data = recipe_data_load(d)
-    return recipe_data.getVar('%s_pn-%s' % (var,pn), True)
-
-# Add a shell variety so that it can work in shell tasks
-# *** In shell tasks, inline python will be executed during parsing, so shell
-# *** variables passed as input.
-recipe_data_get_var_sh() {
-    local pn="$1"
-    local var="$2"
-
-    sed -ne 's|'$var'_pn-'$pn'[ \t]*=[ \t]*"\(.*\)"[ \t]*$|\1|p' ${RECIPE_DATA_FILE}
-}
-
-# Update the conf file with a new data.
-# Variables such as "FILE" and "TOPDIR" are filtered out by default.
-def recipe_data_update(fn, update_data, var_blacklist = ['__.*', 'FILE', 'TOPDIR'], expand = False):
-    import re
-
-    recipe_data = bb.data.init()
-
-    # Create the regex to filter out variables
-    re_blacklist = re.compile('^' + '$|^'.join(var_blacklist) + '$')
-    with bb.utils.fileslocked([fn + '.lock']):
-        try:
-            bb.parse.handle(fn, recipe_data)
-        except:
-            pass
-
-        for var in update_data.keys():
-            recipe_data.setVar(var, update_data.getVar(var,expand))
-
-        # We could use bb.data_smart's built in "emit_var", but that gives
-        # unnecessary comments.
-        with open(fn, "w") as f:
-            for var in recipe_data.keys():
-                if not re_blacklist.match(var):
-                    f.write('%s = "%s"\n' % (var, recipe_data.getVar(var,expand)))
-
-
-addtask emit_recipe_data
-do_emit_recipe_data[nostamp] = "1"
-python do_emit_recipe_data(){
-    recipe_vars = (d.getVar('RECIPE_DATA_VARS', True) or '').split()
-    recipe_data_file = d.getVar('RECIPE_DATA_FILE', True)
-
-    pn = d.getVar('PN', True) or bb.fatal('"PN" is not defined!')
-
-    data = bb.data.init()
-
-    # Set pn-${PN} to the overrides for convenience
-    data.setVar('OVERRIDES', 'pn-${PN}')
-    for var in recipe_vars:
-        val = d.getVar(var, True) or ''
-        data.setVar('%s_pn-%s' % (var, pn), val)
-
-    recipe_data_update(recipe_data_file, data)
-}
-
-# Add empty task to control dependencies
-addtask emit_recipe_data_all after do_emit_recipe_data
-do_emit_recipe_data_all[noexec] = "1"
-do_emit_recipe_data_all[nostamp] = "1"
-do_emit_recipe_data_all[recrdeptask] = "do_emit_recipe_data_all do_emit_recipe_data"
-do_emit_recipe_data_all[recideptask] = "do_${BB_DEFAULT_TASK}"
-do_emit_recipe_data_all() {
-    :
-}
diff --git a/meta-arago-distro/classes/tisdk-bundle.bbclass b/meta-arago-distro/classes/tisdk-bundle.bbclass
index 34349db3..84bf364b 100644
--- a/meta-arago-distro/classes/tisdk-bundle.bbclass
+++ b/meta-arago-distro/classes/tisdk-bundle.bbclass
@@ -444,43 +444,6 @@ sw_manifest_host() {
     sw_manifest_table_footer
 }
 
-# Use the recipe-data class to collect SRC_URI for the manifest.
-#
-# While this will need to be globally INHERIT'd to work properly, inherit
-# locally so that parsing does not fail.
-inherit recipe-data
-
-# Instead of re-adding the do_rootfs task, re-add the do_emit_recipe_data_all
-#  task to run before do_rootfs.
-deltask do_emit_recipe_data_all
-
-# There seems to be something special with the rootfs task and task dependencies
-# are not working as expected, so use the install task instead.
-addtask emit_recipe_data_all after do_emit_recipe_data before do_install
-
-get_sources_from_recipe(){
-    [ ! -z "$1" ] || return 0
-
-    # Check if a full URL is given (e.g. ipks from sourceipk class)
-    if [ $(echo "$1" | grep -c '://') -gt 0 ]
-    then
-        echo "$1"
-        return 0
-    fi
-
-    # Now assume that this was created by the package_ipk class
-
-    # Cannot assume that recipe filename is ${PN}_${PV}.bb
-    # This is easily seen with BBCLASSEXTEND recipes.
-    for pn in $(sed -ne 's|FILE_pn-\([^ \t=]*\)[ \t]*=[ \t]*".*/'$1'".*|\1|p' "${RECIPE_DATA_FILE}")
-    do
-        # Only need a single PN incase there are native, nativesdk, target variants.
-        break
-    done
-
-    recipe_data_get_var_sh "$pn" "SRC_URI"
-}
-
 # This function expects to be passed the following parameter
 #   - The location to the opkg info directory containing the control files
 #     of the installed packages
@@ -491,9 +454,6 @@ generate_sw_manifest_table() {
     control_dir="$1"
     gplv3_only="$2"
 
-    # Call this here so that the function gets added to the task script
-    get_sources_from_recipe
-
     if [ ! -d "$control_dir" ]
     then
         echo "Could not find the control directory ($control_dir)"
@@ -583,8 +543,7 @@ EOF
         long_version="`cat $i | grep Version: | awk {'print $2'}`"
         license="`cat $i | grep License: | cut -d: -f2 `"
         architecture="`cat $i | grep Architecture: | awk {'print $2'}`"
-        recipe="`cat $i | grep Source: | cut -d ':' -f2-`"
-        sources="`get_sources_from_recipe $recipe`"
+        sources="`cat $i | grep Source: | cut -d ':' -f2-`"
         location="$package""_""$long_version""_""$architecture"".ipk"
 
         # Set the highlight color if the license in GPLv3.  If this is
diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf
index d9f84cbd..33454068 100644
--- a/meta-arago-distro/conf/distro/arago.conf
+++ b/meta-arago-distro/conf/distro/arago.conf
@@ -163,9 +163,6 @@ require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc
 #TARGET_CPPFLAGS += "-fstack-protector -D_FORTIFY_SOURCE=1"
 #TARGET_CPPFLAGS += "-fstack-protector"
 
-# Inherit "recipe-data" class to populate SRC_URI in manifest
-INHERIT += "recipe-data"
-
 # Load default preferences
 require conf/distro/include/arago-prefs.inc