Fix just and funnel clean functions