diff --git a/generate_singlerepo_source_tarball.sh b/generate_singlerepo_source_tarball.sh
deleted file mode 100644
index 62218ba..0000000
--- a/generate_singlerepo_source_tarball.sh
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/bin/bash
-# Generates the 'source tarball' for JDK projects.
-#
-# Example:
-# When used from local repo set REPO_ROOT pointing to file:// with your repo
-# if your local repo follows upstream forests conventions, you may be enough by setting OPENJDK_URL
-# if you wont to use local copy of patch PR2126 set path to it to PR2126 variable
-#
-# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
-# PROJECT_NAME=jdk
-# REPO_NAME=jdk
-# VERSION=tip
-# or to eg prepare systemtap:
-# icedtea7's jstack and other tapsets
-# VERSION=6327cf1cea9e
-# REPO_NAME=icedtea7-2.6
-# PROJECT_NAME=release
-# OPENJDK_URL=http://icedtea.classpath.org/hg/
-# TO_COMPRESS="*/tapset"
-# 
-# They are used to create correct name and are used in construction of sources url (unless REPO_ROOT is set)
-
-# This script creates a single source tarball out of the repository
-# based on the given tag and removes code not allowed in fedora/rhel. For
-# consistency, the source tarball will always contain 'openjdk' as the top
-# level folder, name is created, based on parameter
-#
-
-if [ ! "x$PR2126" = "x" ] ; then
-  if [ ! -f "$PR2126" ] ; then
-    echo "You have specified PR2126 as $PR2126 but it does not exists. exiting"
-    exit 1
-  fi
-fi
-
-set -e
-
-OPENJDK_URL_DEFAULT=http://hg.openjdk.java.net
-COMPRESSION_DEFAULT=xz
-
-if [ "x$1" = "xhelp" ] ; then
-    echo -e "Behaviour may be specified by setting the following variables:\n"
-    echo "VERSION - the version of the specified OpenJDK project"
-    echo "PROJECT_NAME -- the name of the OpenJDK project being archived (optional; only needed by defaults)"
-    echo "REPO_NAME - the name of the OpenJDK repository (optional; only needed by defaults)"
-    echo "OPENJDK_URL - the URL to retrieve code from (optional; defaults to ${OPENJDK_URL_DEFAULT})"
-    echo "COMPRESSION - the compression type to use (optional; defaults to ${COMPRESSION_DEFAULT})"
-    echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to PROJECT_NAME-REPO_NAME-VERSION)"
-    echo "REPO_ROOT - the location of the Mercurial repository to archive (optional; defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME)"
-    echo "TO_COMPRESS - what part of clone to pack (default is openjdk)"
-    echo "PR2126 - the path to the PR2126 patch to apply (optional; downloaded if unavailable)"
-    exit 1;
-fi
-
-
-if [ "x$VERSION" = "x" ] ; then
-    echo "No VERSION specified"
-    exit -2
-fi
-echo "Version: ${VERSION}"
-    
-# REPO_NAME is only needed when we default on REPO_ROOT and FILE_NAME_ROOT
-if [ "x$FILE_NAME_ROOT" = "x" -o "x$REPO_ROOT" = "x" ] ; then
-  if [ "x$PROJECT_NAME" = "x" ] ; then
-    echo "No PROJECT_NAME specified"
-    exit -1
-  fi
-  echo "Project name: ${PROJECT_NAME}"
-  if [ "x$REPO_NAME" = "x" ] ; then
-    echo "No REPO_NAME specified"
-    exit -3
-  fi
-  echo "Repository name: ${REPO_NAME}"
-fi
-
-if [ "x$OPENJDK_URL" = "x" ] ; then
-    OPENJDK_URL=${OPENJDK_URL_DEFAULT}
-    echo "No OpenJDK URL specified; defaulting to ${OPENJDK_URL}"
-else
-    echo "OpenJDK URL: ${OPENJDK_URL}"
-fi
-
-if [ "x$COMPRESSION" = "x" ] ; then
-    # rhel 5 needs tar.gz
-    COMPRESSION=${COMPRESSION_DEFAULT}
-fi
-echo "Creating a tar.${COMPRESSION} archive"
-
-if [ "x$FILE_NAME_ROOT" = "x" ] ; then
-    FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
-    echo "No file name root specified; default to ${FILE_NAME_ROOT}"
-fi
-if [ "x$REPO_ROOT" = "x" ] ; then
-    REPO_ROOT="${OPENJDK_URL}/${PROJECT_NAME}/${REPO_NAME}"
-    echo "No repository root specified; default to ${REPO_ROOT}"
-fi;
-
-if [ "x$TO_COMPRESS" = "x" ] ; then
-    TO_COMPRESS="openjdk"
-    echo "No to be compressed targets specified, ; default to ${TO_COMPRESS}"
-fi;
-
-if [ -d ${FILE_NAME_ROOT} ] ; then
-  echo "exists exists exists exists exists exists exists "
-  echo "reusing reusing reusing reusing reusing reusing "
-  echo ${FILE_NAME_ROOT}
-else
-  mkdir "${FILE_NAME_ROOT}"
-  pushd "${FILE_NAME_ROOT}"
-    echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
-    hg clone ${REPO_ROOT} openjdk -r ${VERSION}
-  popd
-fi
-pushd "${FILE_NAME_ROOT}"
-    if [ -d openjdk/src ]; then 
-        pushd openjdk
-            echo "Removing EC source code we don't build"
-            CRYPTO_PATH=src/jdk.crypto.ec/share/native/libsunec/impl
-            rm -vrf $CRYPTO_PATH
-            echo "Syncing EC list with NSS"
-            if [ "x$PR2126" = "x" ] ; then
-                # orriginally for 8:
-                # get pr2126.patch (from http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8d2c9a898f50) from most correct tag
-                # Do not push it or publish it (see http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2126)
-                # there is currnetly no "upstram version of this patch, hardcoding custom version
-                PR2126="../../pr2126-11.patch"
-            fi;
-            echo "Applying ${PR2126}"
-            patch -Np1 < $PR2126
-            find . -name '*.orig' -exec rm -vf '{}' ';'
-        popd
-    fi
-
-    echo "Compressing remaining forest"
-    if [ "X$COMPRESSION" = "Xxz" ] ; then
-        SWITCH=cJf
-    else
-        SWITCH=czf
-    fi
-    tar --exclude-vcs -$SWITCH ${FILE_NAME_ROOT}.tar.${COMPRESSION} $TO_COMPRESS
-    mv ${FILE_NAME_ROOT}.tar.${COMPRESSION}  ..
-popd
-echo "Done. You may want to remove the uncompressed version - $FILE_NAME_ROOT."
-
-
diff --git a/get_sources.sh b/get_sources.sh
deleted file mode 100755
index 0231bae..0000000
--- a/get_sources.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-ID=${1}
-FEATUREVER=1.8.0
-
-if [ "x${ID}" = "x" ] ; then
-    echo "$0 <ID>";
-    exit 1;
-fi
-
-if [ "x${TMPDIR}" = "x" ] ; then
-    TMPDIR=/tmp
-fi
-
-downloaddir=${TMPDIR}/download.$$
-mkdir ${downloaddir}
-pushd ${downloaddir}
-echo "Downloading build ${ID} in ${downloaddir}";
-brew download-build ${ID}
-
-versionregexp="[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*\.b[0-9]*-[0-9]*"
-basename=$(ls|grep java-${FEATUREVER}-openjdk-portable-unstripped-${versionregexp}.el7openjdkportable.x86_64.rpm)
-version=$(echo ${basename}|sed -r "s|^.*-(${versionregexp})\.el7.*$|\1|")
-
-echo "Downloaded version ${version}"
-
-# Remove stripped release builds for portable and JREs
-rm -vf java-${FEATUREVER}-openjdk-portable-${FEATUREVER}*
-rm -vf java-${FEATUREVER}-openjdk-portable-devel-${FEATUREVER}*
-rm -vf java-${FEATUREVER}-openjdk-portable-slowdebug-${FEATUREVER}*
-rm -vf java-${FEATUREVER}-openjdk-portable-fastdebug-${FEATUREVER}*
-
-mkdir unpacked
-for file in *.rpm; do
-    cat ${file} | rpm2archive - | tar -C unpacked -xzv
-done
-
-mkdir ${HOME}/${version}
-mv unpacked/usr/lib/jvm/* ${HOME}/${version}
-
-pushd ${HOME}/${version}
-for file in *.sha256sum; do
-    if ! sha256sum --check ${file} ; then
-	echo "${file} failed checksum.";
-	exit 2;
-    fi
-done
-popd
-
-rm -rf unpacked
-echo rm -vf *.rpm
-
-popd
-
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index cd922e6..39bbd1e 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -2940,6 +2940,9 @@ cjc.mainProgram(args)
 - openjdk_news.sh: shellcheck: Double-quote variable references (SC2086)
 - openjdk_news.sh: shellcheck: Remove x-prefixes since we use Bash (SC2268)
 - openjdk_news.sh: shellcheck: Remove deprecated egrep usage (SC2196)
+- Remove obsolete file generate_singlerepo_source_tarball.sh
+- Remove obsolete file get_sources.sh
+- Remove obsolete file update_main_sources.sh
 - Sync patch set with portable build
 - Related: RHEL-30937
 
diff --git a/update_main_sources.sh b/update_main_sources.sh
deleted file mode 100755
index 5f78b8d..0000000
--- a/update_main_sources.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/bash -x
-# Generates the 'source tarball' for JDK 8 projects and update spec infrastructure
-# By default, this script regenerate source as they are currently used. 
-# so if the version of sources change, this file changes and is pushed
-#
-# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
-# PROJECT_NAME=jdk8u   OR   aarch64-port 
-# REPO_NAME=jdk8u60    OR   jdk8u60 
-# VERSION=jdk8u60-b27  OR aarch64-jdk8u65-b17 OR for head, keyword 'tip' should do the job there
-# 
-# If you don't, default are used and so already uploaded tarball regenerated
-# They are used to create correct name and are used in construction of sources url (unless REPO_ROOT is set)
-# 
-# For other useful variables see generate_source_tarball.sh
-#
-# the used values are then substituted to spec and sources
-
-if [ ! "x$PR2126" = "x" ] ; then
-  if [ ! -f "$PR2126" ] ; then
-    echo "You have specified PR2126 as $PR2126 but it does not exists. exiting"
-    exit 1
-  fi
-fi
-
-set -e
-
-if [ "x$PROJECT_NAME" = "x" ] ; then
-    PROJECT_NAME="aarch64-port"
-fi
-if [ "x$REPO_NAME" = "x" ] ; then
-    REPO_NAME="jdk8u-shenandoah"
-fi
-if [ "x$VERSION" = "x" ] ; then
-    VERSION="aarch64-shenandoah-jdk8u181-b15"
-fi
-
-if [ "x$COMPRESSION" = "x" ] ; then
-# rhel 5 needs tar.gz
-    COMPRESSION=xz
-fi
-if [ "x$FILE_NAME_ROOT" = "x" ] ; then
-    FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
-fi
-if [ "x$PKG" = "x" ] ; then
-    URL=`cat .git/config  | grep url`
-    PKG=${URL##*/}
-fi
-if [ "x$SPEC" = "x" ] ; then
-    SPEC=${PKG}.spec
-fi
-if [ "x$RELEASE" = "x" ] ; then
-    RELEASE=1
-fi
-
-FILENAME=${FILE_NAME_ROOT}.tar.${COMPRESSION}
-
-if [ ! -f ${FILENAME} ] ; then
-echo "Generating ${FILENAME}"
-. ./generate_source_tarball.sh
-else 
-echo "${FILENAME} already exists, using"
-fi
-
-
-echo "Touching spec: $SPEC"
-echo sed -i "s/^%global\s\+project.*/%global project         ${PROJECT_NAME}/" $SPEC 
-echo sed -i "s/^%global\s\+repo.*/%global repo            ${REPO_NAME}/" $SPEC 
-echo sed -i "s/^%global\s\+revision.*/%global revision        ${VERSION}/" $SPEC 
-# updated sources, resetting release
-echo sed -i "s/^Release:.*/Release: $RELEASE.%{buildver}%{?dist}/" $SPEC
-
-echo "New sources"
-cat sources
-a_sources=`cat sources | sed "s/.*(//g" | sed "s/).*//g" | sed "s/.*\s\+//g"`
-echo "    you can get inspired by following %changelog template:"
-user_name=`whoami`
-user_record=$(getent passwd $user_name)
-user_gecos_field=$(echo "$user_record" | cut -d ':' -f 5)
-user_full_name=$(echo "$user_gecos_field" | cut -d ',' -f 1)
-spec_date=`date +"%a %b %d %Y"`
-# See spec:
-revision_helper=`echo ${MAIN_VERSION%-*}`
-updatever=`echo ${revision_helper##*u}`
-buildver=`echo ${MAIN_VERSION##*-}`
-echo "* $spec_date $user_full_name <$user_name@redhat.com> - 1:1.8.0.$updatever-$RELEASE.$buildver" 
-echo "- updated to $MAIN_VERSION (from $PROJECT_NAME/$MAIN_REPO_NAME)"
-echo "- updated to $VERSION (from $PROJECT_NAME/$REPO_NAME) of hotspot"
-echo "- used $FILENAME as new sources"
-echo "- used $FILENAME_SH as new sources for hotspot"
-
-echo "    execute:"
-echo "fedpkg/rhpkg new-sources "$a_sources
-echo "    to upload sources"
-echo "you can verify by fedpkg/rhpkg prep --arch XXXX on all architectures: x86_64 i386 i586 i686 ppc ppc64 ppc64le s390 s390x aarch64 armv7hl"
-