Update for interface changes.

The removeIndex() change needs more changes, it can now be a string or an object somehow.