Always keep location around in case we need to delete a file

Always keep location around in case we need to delete a file #1249