diff --git a/pyp2rpm/templates/epel6.spec b/pyp2rpm/templates/epel6.spec
index b25c3285..ce480699 100644
--- a/pyp2rpm/templates/epel6.spec
+++ b/pyp2rpm/templates/epel6.spec
@@ -44,10 +44,6 @@ Documentation for {{ data.name }}
 
 %prep
 %setup -q -n %{pypi_name}-%{version}
-{%- if data.has_bundled_egg_info %}
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
-{%- endif %}
 {% call(pv) for_python_versions(data.sorted_python_versions, data.base_python_version) -%}
 {%- if pv != data.base_python_version -%}
 rm -rf python{{pv}}
diff --git a/pyp2rpm/templates/epel7.spec b/pyp2rpm/templates/epel7.spec
index 9c68565a..fd734af2 100644
--- a/pyp2rpm/templates/epel7.spec
+++ b/pyp2rpm/templates/epel7.spec
@@ -39,10 +39,6 @@ Documentation for {{ data.name }}
 
 %prep
 %autosetup -n {{ data.dirname|replace(data.name, '%{pypi_name}')|replace(data.version, '%{version}')|default('%{pypi_name}-%{version}', true) }}
-{%- if data.has_bundled_egg_info %}
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
-{%- endif %}
 
 %build
 {%- for pv in data.sorted_python_versions %}
diff --git a/pyp2rpm/templates/fedora.spec b/pyp2rpm/templates/fedora.spec
index 2764e35b..264189e3 100644
--- a/pyp2rpm/templates/fedora.spec
+++ b/pyp2rpm/templates/fedora.spec
@@ -40,10 +40,6 @@ Documentation for {{ data.name }}
 
 %prep
 %autosetup -n {{ data.dirname|replace(data.name, '%{pypi_name}')|replace(data.version, '%{version}')|default('%{pypi_name}-%{version}', true) }}
-{%- if data.has_bundled_egg_info %}
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
-{%- endif %}
 
 %build
 {%- for pv in data.sorted_python_versions %}
diff --git a/pyp2rpm/templates/mageia.spec b/pyp2rpm/templates/mageia.spec
index 270568ea..d1e45474 100644
--- a/pyp2rpm/templates/mageia.spec
+++ b/pyp2rpm/templates/mageia.spec
@@ -40,10 +40,6 @@ Documentation for {{ data.name }}
 
 %prep
 %autosetup -n {{ data.dirname|replace(data.name, '%{pypi_name}')|replace(data.version, '%{version}')|default('%{pypi_name}-%{version}', true) }}
-{%- if data.has_bundled_egg_info %}
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
-{%- endif %}
 
 %build
 {%- for pv in data.sorted_python_versions %}
diff --git a/pyp2rpm/templates/pld.spec b/pyp2rpm/templates/pld.spec
index 95b281a9..bd77642d 100644
--- a/pyp2rpm/templates/pld.spec
+++ b/pyp2rpm/templates/pld.spec
@@ -79,11 +79,6 @@ Group:		Libraries/Python
 
 %prep
 %setup -q -n %{pypi_name}-%{version}
-{%- if data.has_bundled_egg_info %}
-
-# Remove bundled egg-info
-%{__rm} -r %{egg_name}.egg-info
-{%- endif %}
 
 {% call(pv) for_python_versions([data.base_python_version] + data.python_versions, data.base_python_version, use_with=False) -%}
 {%- if data.sphinx_dir %}
diff --git a/tests/test_data/python-Jinja2_dnfnc.spec b/tests/test_data/python-Jinja2_dnfnc.spec
index 97b07306..86723ceb 100644
--- a/tests/test_data/python-Jinja2_dnfnc.spec
+++ b/tests/test_data/python-Jinja2_dnfnc.spec
@@ -65,8 +65,6 @@ Documentation for Jinja2
 
 %prep
 %autosetup -n %{pypi_name}-%{version}
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
 
 %build
 %py2_build
diff --git a/tests/test_data/python-Jinja2_epel6_dnfnc.spec b/tests/test_data/python-Jinja2_epel6_dnfnc.spec
index 11339159..5f98d33f 100644
--- a/tests/test_data/python-Jinja2_epel6_dnfnc.spec
+++ b/tests/test_data/python-Jinja2_epel6_dnfnc.spec
@@ -35,8 +35,6 @@ Documentation for Jinja2
 
 %prep
 %setup -q -n %{pypi_name}-%{version}
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
 
 # generate html docs
 PYTHONPATH=${PWD} sphinx-build docs html
diff --git a/tests/test_data/python-Jinja2_epel6_nc.spec b/tests/test_data/python-Jinja2_epel6_nc.spec
index 34eddb9a..45c8620c 100644
--- a/tests/test_data/python-Jinja2_epel6_nc.spec
+++ b/tests/test_data/python-Jinja2_epel6_nc.spec
@@ -35,8 +35,6 @@ Documentation for Jinja2
 
 %prep
 %setup -q -n %{pypi_name}-%{version}
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
 
 # generate html docs
 PYTHONPATH=${PWD} sphinx-build docs html
diff --git a/tests/test_data/python-Jinja2_epel7_dnfnc.spec b/tests/test_data/python-Jinja2_epel7_dnfnc.spec
index 1b0bc439..429d2d1d 100644
--- a/tests/test_data/python-Jinja2_epel7_dnfnc.spec
+++ b/tests/test_data/python-Jinja2_epel7_dnfnc.spec
@@ -63,8 +63,6 @@ Documentation for Jinja2
 
 %prep
 %autosetup -n %{pypi_name}-%{version}
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
 
 %build
 %{__python2} setup.py build
diff --git a/tests/test_data/python-Jinja2_epel7_nc.spec b/tests/test_data/python-Jinja2_epel7_nc.spec
index cf7a435f..01d8933b 100644
--- a/tests/test_data/python-Jinja2_epel7_nc.spec
+++ b/tests/test_data/python-Jinja2_epel7_nc.spec
@@ -63,8 +63,6 @@ Documentation for Jinja2
 
 %prep
 %autosetup -n %{pypi_name}-%{version}
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
 
 %build
 %{__python2} setup.py build
diff --git a/tests/test_data/python-Jinja2_mageia_py23.spec b/tests/test_data/python-Jinja2_mageia_py23.spec
index 5557186c..788f9684 100644
--- a/tests/test_data/python-Jinja2_mageia_py23.spec
+++ b/tests/test_data/python-Jinja2_mageia_py23.spec
@@ -65,8 +65,6 @@ Documentation for Jinja2
 
 %prep
 %autosetup -n %{pypi_name}-%{version}
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
 
 %build
 %py2_build
diff --git a/tests/test_data/python-Jinja2_nc.spec b/tests/test_data/python-Jinja2_nc.spec
index 375b0255..361a050b 100644
--- a/tests/test_data/python-Jinja2_nc.spec
+++ b/tests/test_data/python-Jinja2_nc.spec
@@ -65,8 +65,6 @@ Documentation for Jinja2
 
 %prep
 %autosetup -n %{pypi_name}-%{version}
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
 
 %build
 %py2_build
diff --git a/tests/test_data/python-Jinja2_py23_autonc.spec b/tests/test_data/python-Jinja2_py23_autonc.spec
index 8cbf0ccd..92a93795 100644
--- a/tests/test_data/python-Jinja2_py23_autonc.spec
+++ b/tests/test_data/python-Jinja2_py23_autonc.spec
@@ -65,8 +65,6 @@ Documentation for Jinja2
 
 %prep
 %autosetup -n %{pypi_name}-%{version}
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
 
 %build
 %py2_build
diff --git a/tests/test_data/python-Jinja2_py2_autonc.spec b/tests/test_data/python-Jinja2_py2_autonc.spec
index 952d7896..37c32077 100644
--- a/tests/test_data/python-Jinja2_py2_autonc.spec
+++ b/tests/test_data/python-Jinja2_py2_autonc.spec
@@ -46,8 +46,6 @@ Documentation for Jinja2
 
 %prep
 %autosetup -n %{pypi_name}-%{version}
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
 
 %build
 %py2_build
diff --git a/tests/test_data/python-Jinja2_py3_autonc.spec b/tests/test_data/python-Jinja2_py3_autonc.spec
index 6f40aa09..cc6b4b73 100644
--- a/tests/test_data/python-Jinja2_py3_autonc.spec
+++ b/tests/test_data/python-Jinja2_py3_autonc.spec
@@ -46,8 +46,6 @@ Documentation for Jinja2
 
 %prep
 %autosetup -n %{pypi_name}-%{version}
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
 
 %build
 %py3_build
diff --git a/tests/test_data/python-StructArray_autonc.spec b/tests/test_data/python-StructArray_autonc.spec
index 76618cc4..e5a23401 100644
--- a/tests/test_data/python-StructArray_autonc.spec
+++ b/tests/test_data/python-StructArray_autonc.spec
@@ -36,8 +36,6 @@ equation. It's...
 
 %prep
 %autosetup -n %{pypi_name}-%{version}
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
 
 %build
 %py2_build
diff --git a/tests/test_data/python-buildkit_autonc.spec b/tests/test_data/python-buildkit_autonc.spec
index d644fadd..fa1eee12 100644
--- a/tests/test_data/python-buildkit_autonc.spec
+++ b/tests/test_data/python-buildkit_autonc.spec
@@ -38,8 +38,6 @@ repo...
 
 %prep
 %autosetup -n %{pypi_name}-%{version}
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
 
 %build
 %py2_build
diff --git a/tests/test_data/python-paperwork-backend.spec b/tests/test_data/python-paperwork-backend.spec
index 17f19968..d4f56fa2 100644
--- a/tests/test_data/python-paperwork-backend.spec
+++ b/tests/test_data/python-paperwork-backend.spec
@@ -41,8 +41,6 @@ Indexing - Searching - Suggestions- ExportThere is no GUI here. The GUI is .
 
 %prep
 %autosetup -n %{pypi_name}-%{version}
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
 
 %build
 %py3_build
diff --git a/tests/test_data/python-sphinx_autonc.spec b/tests/test_data/python-sphinx_autonc.spec
index e3bc2d58..60a0bada 100644
--- a/tests/test_data/python-sphinx_autonc.spec
+++ b/tests/test_data/python-sphinx_autonc.spec
@@ -124,8 +124,6 @@ Documentation for Sphinx
 
 %prep
 %autosetup -n %{pypi_name}-%{version}
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
 
 %build
 %py2_build