Yogi wields broom, vows to make UP ODF by 2018