Revised Feed_cleanup(i)