Unneeded i_rem removal