Rm unnecessary step fn