diff --git a/External/pyAMI/CMakeLists.txt b/External/pyAMI/CMakeLists.txt
deleted file mode 100644
index 0bd76613d2169ee1c6047d683bb80efa4b906b7f..0000000000000000000000000000000000000000
--- a/External/pyAMI/CMakeLists.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-
-# The name of the package:
-atlas_subdir( pyAMI )
-
-# In "release mode" return right away:
-if( ATLAS_RELEASE_MODE )
- return()
-endif()
-
-# Helper macro for building and installing the package(s). Documentation
-# to be written later...
-function( _setup_python_package name file md5 )
-
- # Parse the optional argument(s):
- cmake_parse_arguments( ARG "" "" "" ${ARGN} )
-
- # Build the package with the help of python's distutils:
- ExternalProject_Add( ${name}
- PREFIX ${CMAKE_BINARY_DIR}
- URL ${file}
- URL_MD5 ${md5}
- BUILD_IN_SOURCE 1
- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E echo
- "Configuring the build of ${name}"
- BUILD_COMMAND
- ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/atlas_build_run.sh
- python setup.py build
- INSTALL_COMMAND ${CMAKE_COMMAND} -E make_directory
- ${CMAKE_PYTHON_OUTPUT_DIRECTORY}
- COMMAND ${CMAKE_COMMAND} -E make_directory
- ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
- COMMAND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/atlas_build_run.sh
- python setup.py install --prefix ${CMAKE_BINARY_DIR}/${ATLAS_PLATFORM}
- --exec-prefix ${CMAKE_BINARY_DIR}/${ATLAS_PLATFORM}
- --root /
- --install-lib ${CMAKE_PYTHON_OUTPUT_DIRECTORY}
- --install-scripts ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} )
-
- # Make the package target depend on this one:
- add_dependencies( Package_pyAMI ${name} )
-
- # Get the package directory:
- atlas_get_package_dir( pkgDir )
-
- # Add some metadata to the target:
- set_property( TARGET ${name} PROPERTY LABEL pyAMI )
- set_property( TARGET ${name} PROPERTY FOLDER ${pkgDir} )
-
- # Generate the package installer script:
- configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/pkgbuildInstall.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/${name}PkgbuildInstall.cmake
- @ONLY )
-
- # Use this script for installing the package:
- install( SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/${name}PkgbuildInstall.cmake )
-
-endfunction( _setup_python_package )
-
-# Install pyAMI:
-#_setup_python_package( pyAMI
-# ${CMAKE_CURRENT_SOURCE_DIR}/src/pyAMI-5.0.3.2.tar.gz
-# 2fe796f738baeae72e5837ebc0d072c1 )
-_setup_python_package( pyAMI
- ${CMAKE_CURRENT_SOURCE_DIR}/src/pyAMI-5.0.3.2-patched.tar.gz
- 77b1830e5aaf24a36cd12e0dfb623a55 )
-
-# Clean up:
-unset( _setup_python_package )
-
-
diff --git a/External/pyAMI/pkgbuildInstall.cmake.in b/External/pyAMI/pkgbuildInstall.cmake.in
deleted file mode 100644
index 535c1866c9e7b8eeb901e31fc74be3d4ae861092..0000000000000000000000000000000000000000
--- a/External/pyAMI/pkgbuildInstall.cmake.in
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Script installing a setuptools / distutils based Python package
-# during the release installation, under $CMAKE_INSTALL_PREFIX.
-#
-
-# Get the destination directory as an absolute path, as the setup.py script
-# can't deal with relative paths correctly.
-if( NOT "$ENV{DESTDIR}" STREQUAL "" )
- get_filename_component( _destdir $ENV{DESTDIR} ABSOLUTE )
-endif()
-
-# Install the package:
-execute_process(
- COMMAND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/atlas_build_run.sh
- python setup.py install
- --prefix ${_destdir}${CMAKE_INSTALL_PREFIX}
- --exec-prefix ${_destdir}${CMAKE_INSTALL_PREFIX}
- --root /
- --install-lib ${_destdir}${CMAKE_INSTALL_PREFIX}/@CMAKE_INSTALL_PYTHONDIR@
- --install-scripts ${_destdir}${CMAKE_INSTALL_PREFIX}/@CMAKE_INSTALL_BINDIR@
- --record @CMAKE_CURRENT_BINARY_DIR@/@name@_installed.files
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src/@name@ )
-
-# Read in the list of installed files, and select ones put into the
-# binary directory.
-file( READ @CMAKE_CURRENT_BINARY_DIR@/@name@_installed.files
- _installedFiles LIMIT 10000000 )
-string( SUBSTRING "${_destdir}${CMAKE_INSTALL_PREFIX}/@CMAKE_INSTALL_BINDIR@"
- 1 -1 _binDir )
-string( REGEX MATCHALL "(^|\n)${_binDir}[^\n]+" _executables
- ${_installedFiles} )
-
-# Loop over the installed executables:
-foreach( _exec ${_executables} )
- # And replace the absolute python executable names in them with
- # relocatable ones.
- string( STRIP ${_exec} _execName )
- # This is unfortunately very unportable. But should be hopefully good
- # enough on all POSIX platforms at least.
- execute_process( COMMAND
- sed "s/^#!\\/.*\\/python/#!\\/usr\\/bin\\/env python/"
- "/${_execName}"
- COMMAND tee /${_execName}Fixed
- COMMAND ${CMAKE_COMMAND} -E rename "/${_execName}Fixed" "/${_execName}" )
- # For some reason this doesn't work correctly (in CMake 3.3.2) when put at
- # the end of the previous execute_process(...) call. Only when used in a
- # separate call...
- execute_process( COMMAND chmod 755 /${_execName} )
-endforeach()
diff --git a/External/pyAMI/python/pyAMITest.py b/External/pyAMI/python/pyAMITest.py
deleted file mode 100644
index cbd779ca8ba5277919b7c338760f2afd1cddc42c..0000000000000000000000000000000000000000
--- a/External/pyAMI/python/pyAMITest.py
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#############################################################################
-# Author : Jerome ODIER, Jerome FULACHIER, Fabian LAMBERT, Solveig ALBRAND
-#
-# Email : jerome.odier@lpsc.in2p3.fr
-# jerome.fulachier@lpsc.in2p3.fr
-# fabian.lambert@lpsc.in2p3.fr
-# solveig.albrand@lpsc.in2p3.fr
-#
-#############################################################################
-
-import sys, pyAMI.utils, pyAMI.client, pyAMI.exception, pyAMI.atlas.api
-
-#############################################################################
-
-if __name__ == '__main__':
-
- ret = 0
-
- #####################################################################
-
- print('#################### TEST 1 ####################')
-
- try:
- client = pyAMI.client.Client('atlas')
-
- print('[SUCCESS]')
-
- except pyAMI.exception.Error as e:
- pyAMI.utils.safeprint('[ERROR] %s' % e)
-
- sys.exit(1)
-
- #####################################################################
-
- print('#################### TEST 2 ####################')
-
- try:
- command = [
- 'GetUserInfo',
- '-amiLogin=jodier',
- ]
-
- pyAMI.utils.safeprint(client.execute(command))
-
- print('[SUCCESS]')
-
- except pyAMI.exception.Error as e:
- pyAMI.utils.safeprint('[ERROR] %s' % e)
-
- ret = 1
-
- #####################################################################
-
- print('#################### TEST 3 ####################')
-
- try:
- pyAMI.utils.safeprint(client.execute('GetUserInfo -amiLogin=jodier', format = 'xml'))
- pyAMI.utils.safeprint(client.execute('GetUserInfo -amiLogin=jodier', format = 'json'))
- pyAMI.utils.safeprint(client.execute('GetUserInfo -amiLogin=jodier', format = 'csv'))
- pyAMI.utils.safeprint(client.execute('GetUserInfo -amiLogin=jodier', format = 'text'))
-
- print('[SUCCESS]')
-
- except pyAMI.exception.Error as e:
- pyAMI.utils.safeprint('[ERROR] %s' % e)
-
- ret = 1
-
- #####################################################################
-
- print('#################### TEST 4 ####################')
-
- try:
- pyAMI.utils.safeprint(client.execute('GetUserInfo -amiLogin=jodier', format = 'dom_object').get_rows())
-
- pyAMI.utils.safeprint(client.execute('GetUserInfo -amiLogin=jodier', format = 'dict_object').get_rows())
-
- print('[SUCCESS]')
-
- except pyAMI.exception.Error as e:
- pyAMI.utils.safeprint('[ERROR] %s' % e)
-
- ret = 1
-
- #####################################################################
-
- print('#################### TEST 5 ####################')
-
- try:
- pyAMI.utils.safeprint(pyAMI.atlas.api.list_datasets(client, patterns = 'data14_cos%', type = 'AOD', order = 'run_number', limit = 10))
-
- print('[SUCCESS]')
-
- except pyAMI.exception.Error as e:
- pyAMI.utils.safeprint('[ERROR] %s' % e)
-
- ret = 1
-
- #####################################################################
-
- sys.exit(ret)
-
-#############################################################################
diff --git a/External/pyAMI/src/pyAMI-5.0.3.2-patched.tar.gz b/External/pyAMI/src/pyAMI-5.0.3.2-patched.tar.gz
deleted file mode 100644
index 1dde42ff566c89757ff909cd650a74ca89f6efd8..0000000000000000000000000000000000000000
Binary files a/External/pyAMI/src/pyAMI-5.0.3.2-patched.tar.gz and /dev/null differ
diff --git a/External/pyAMI/src/pyAMI-5.0.3.2.tar.gz b/External/pyAMI/src/pyAMI-5.0.3.2.tar.gz
deleted file mode 100644
index cf74404fa809233a7cfc4a219b65d1e68d233ccb..0000000000000000000000000000000000000000
Binary files a/External/pyAMI/src/pyAMI-5.0.3.2.tar.gz and /dev/null differ
diff --git a/External/pyAMI/src/pyAMI-py3.patch b/External/pyAMI/src/pyAMI-py3.patch
deleted file mode 100644
index c84617026ff291a0a5a4c6ce880cf7dc46ef94d6..0000000000000000000000000000000000000000
--- a/External/pyAMI/src/pyAMI-py3.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- pyAMI/object.py-orig 2020-01-07 21:33:33.000000001 +0100
-+++ pyAMI/object.py 2020-01-07 21:33:51.000000001 +0100
-@@ -144,7 +144,7 @@
-
- for rowset in self.rowsets:
-
-- if not rowset_type or (rowset.attributes.has_key('type') and rowset.attributes['type'].value == rowset_type):
-+ if not rowset_type or ('type' in rowset.attributes.keys() and rowset.attributes['type'].value == rowset_type):
-
- for row in rowset.getElementsByTagName('row'):
- field_dict = pyAMIDict()
-@@ -152,7 +152,7 @@
- for field in row.getElementsByTagName('field'):
- name = field.attributes['name'].value
-
-- if field.attributes.has_key('table'):
-+ if 'table' in field.attributes.keys():
- table = field.attributes['table'].value
-
- if self.entity and table and self.entity != table:
diff --git a/External/pyAMI/test/pyAMI_TestConfiguration.xml b/External/pyAMI/test/pyAMI_TestConfiguration.xml
deleted file mode 100644
index 623705aa24d67a37d8d468aae857f505e268cb6b..0000000000000000000000000000000000000000
--- a/External/pyAMI/test/pyAMI_TestConfiguration.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE unifiedTestConfiguration SYSTEM "http://www.hep.ucl.ac.uk/atlas/AtlasTesting/DTD/unifiedTestConfiguration.dtd">
-
-<unifiedTestConfiguration>
- <rtt xmlns="http://www.hep.ucl.ac.uk/atlas/AtlasTesting/rtt">
- <rttContactPerson>pyAMI Team (ami@NOSPAMlpsc.in2p3.fr)</rttContactPerson>
- <mailto>ami@NOSPAMlpsc.in2p3.fr</mailto>
- <jobList>
- <jobTransform userJobId="pyAMITest">
- <jobTransformJobName>pyAMITest</jobTransformJobName>
- <jobTransformCmd>python pyAMITest.py > pyAMITest.out</jobTransformCmd>
- <group>pyAMIRTT</group>
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
- </jobTransform>
- </jobList>
- <jobGroups>
- <jobGroup name="pyAMIRTT" parent="Transform">
- <keepFilePattern>pyAMITest*.out</keepFilePattern>
- <auxFilePattern>pyAMITest*.py</auxFilePattern>
- </jobGroup>
- </jobGroups>
- </rtt>
-</unifiedTestConfiguration>
diff --git a/Projects/AthGeneration/package_filters.txt b/Projects/AthGeneration/package_filters.txt
index 85fd11c0ba723d11d7f3d5ebc307c3e83fed1187..e14eb7ea8bdcacffab7ea4d51df4dc4fe1a34602 100644
--- a/Projects/AthGeneration/package_filters.txt
+++ b/Projects/AthGeneration/package_filters.txt
@@ -115,7 +115,6 @@
+ Event/xAOD/xAODTruthCnv
+ External/AtlasDataArea
+ External/Pythia8
-+ External/pyAMI
+ Generators/Charybdis_i
- Generators/EmbeddedTrackGenerator
- Generators/ExoGraviton_i
diff --git a/Projects/AthSimulation/package_filters.txt b/Projects/AthSimulation/package_filters.txt
index 8ffa36e97924f0993b514d800d4fba071430220f..460177488c00c7067d487aed6d4873ddb5fbdea8 100644
--- a/Projects/AthSimulation/package_filters.txt
+++ b/Projects/AthSimulation/package_filters.txt
@@ -152,7 +152,6 @@
+ Event/xAOD/xAODTruthAthenaPool
+ Event/xAOD/xAODTruthCnv
+ External/AtlasDataArea
-+ External/pyAMI
+ Generators/GenInterfaces
+ Generators/GeneratorObjects
+ Generators/GeneratorObjectsAthenaPool