Remove canonical file usage

Removing the use of canonical file throughout the model.
I haven't verified it but this may fix #866 - I have a hunch that canonicalising symlink locations was the cause of that bug.