diff --git a/check-pyc-and-pyo-timestamps.py b/check-pyc-and-pyo-timestamps.py
index 76a3421..aab0cc1 100644
--- a/check-pyc-and-pyo-timestamps.py
+++ b/check-pyc-and-pyo-timestamps.py
@@ -6,7 +6,6 @@ import sys
 
 # list of test and other files that we expect not to have bytecode
 not_compiled = [
-    '/usr/bin/pathfix.py',
     'test/bad_coding.py',
     'test/bad_coding2.py',
     'test/badsyntax_3131.py',
diff --git a/python36.spec b/python36.spec
index be80033..a0dd504 100644
--- a/python36.spec
+++ b/python36.spec
@@ -844,11 +844,6 @@ LD_LIBRARY_PATH=./build/optimized ./build/optimized/python \
 rm %{buildroot}%{pylibdir}/Tools/scripts/{2to3,idle3,pydoc3,pyvenv}
 
 
-# Move pathfix.py to bindir
-# See https://github.com/fedora-python/python-rpm-porting/issues/24
-mv %{buildroot}%{pylibdir}/Tools/scripts/pathfix.py %{buildroot}%{_bindir}/
-
-
 # Remove shebang lines from .py files that aren't executable, and
 # remove executability from .py files that don't have a shebang line:
 find %{buildroot} -name \*.py \
@@ -879,9 +874,6 @@ find %{buildroot} -type f -a -name "*.py" -print0 | \
     PYTHONPATH="%{buildroot}%{_libdir}/python%{pybasever} %{buildroot}%{_libdir}/python%{pybasever}/site-packages" \
     xargs -0 %{buildroot}%{_bindir}/python%{pybasever} -O -c 'import py_compile, sys; [py_compile.compile(f, dfile=f.partition("%{buildroot}")[2], optimize=opt) for opt in range(3) for f in sys.argv[1:]]' || :
 
-# Since we have pathfix.py in bindir, this is created, but we don't want it
-rm -rf %{buildroot}%{_bindir}/__pycache__
-
 # Fixup permissions for shared libraries from non-standard 555 to standard 755:
 find %{buildroot} -perm 555 -exec chmod 755 {} \;
 
@@ -1285,7 +1277,6 @@ fi
 %{_bindir}/python%{pybasever}-config
 %{_bindir}/python%{LDVERSION_optimized}-config
 %{_bindir}/python%{LDVERSION_optimized}-*-config
-%{_bindir}/pathfix.py
 %{_libdir}/libpython%{LDVERSION_optimized}.so
 %{_libdir}/pkgconfig/python-%{LDVERSION_optimized}.pc
 %{_libdir}/pkgconfig/python-%{pybasever}.pc