Special handling of target location not needed anymore
7 files changed