Starting to remove absolute path names