Removed all the canonical file look ups.