Fixed and improved handling for data deletion.

Fixed some remaining adapter mentions.

Renamed index to data_index, where needed.

Added binding handling methods, in association with fixes and
improvements for
responding to the deletion of data.