Cleaning derivation engine dependencies towards Sirius, diffmerge & FML