rremove fun fixed