merge fcts, rm unused fcts, etc

Merge request reports

Loading