Tidy up file references