Final changes to allow removal of load_flim_files.