Fixing up remove to not use index.