Remove fct not used anymore.
remove old code. This particular fct support all cases.