RFT: move a file function to the file handler, remove unneccessary properties