fn-join api cleanup