remove filepath_type_id from analysis_filepath
tweak files to reflect removal