rm unused fn
rename fn