Remove useless Funext
Remove more useless funext